refactor: move projectRoot computation to config validation #7415
+111
−88
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
petebacondarwin
force-pushed
the
pbd/refactor-pass-around-project-directory
branch
from
73b1fe9
to
9d271e9
Compare
|
A wrangler prerelease is available for testing. You can install this latest build in your project with: npm install --save-dev https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/12136193054/npm-package-wrangler-7415You can reference the automatically updated head of this PR with: npm install --save-dev https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/prs/7415/npm-package-wrangler-7415Or you can use npx https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/12136193054/npm-package-wrangler-7415 dev path/to/script.jsAdditional artifacts:npx https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/12136193054/npm-package-create-cloudflare-7415 --no-auto-updatenpm install https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/12136193054/npm-package-cloudflare-kv-asset-handler-7415npm install https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/12136193054/npm-package-miniflare-7415npm install https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/12136193054/npm-package-cloudflare-pages-shared-7415npm install https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/12136193054/npm-package-cloudflare-vitest-pool-workers-7415npm install https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/12136193054/npm-package-cloudflare-workers-editor-shared-7415npm install https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/12136193054/npm-package-cloudflare-workers-shared-7415npm install https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/12136193054/npm-package-cloudflare-workflows-shared-7415Note that these links will no longer work once the GitHub Actions artifact expires.
Please ensure constraints are pinned, and |
petebacondarwin
force-pushed
the
pbd/refactor-pass-around-project-directory
branch
from
9d271e9
to
bc40775
Compare
petebacondarwin
force-pushed
the
pbd/refactor-pass-around-project-directory
branch
from
bc40775
to
94bcfcd
Compare
petebacondarwin
added
the
skip-pr-description-validation
penalosa
approved these changes
Dec 3, 2024
| } else if (entryPoint) { | ||
| paths = resolveEntryWithEntryPoint(entryPoint, config.configPath); | ||
| paths = resolveEntryWithEntryPoint(entryPoint, config.projectRoot); |
There was a problem hiding this comment.
I'm not sure why this isn't a type error, but I think the return value here is used further down, and should probably be changed to config.projectRoot as well:
89: const projectRoot = paths.projectRoot ?? process.cwd();There was a problem hiding this comment.
Oops I missed that one.
It is not a type error it is just redundant further down.
| @@ -69,7 +69,6 @@ type Props = { | |||
| dryRun: boolean | undefined; | |||
| noBundle: boolean | undefined; | |||
| keepVars: boolean | undefined; | |||
There was a problem hiding this comment.
Unrelated to this PR, but it looks like these props could do with some cleanup... They seem to take both config.rules and config as separate values?
There was a problem hiding this comment.
So in the call site for versionsUpload() there is rules: getRules(config), which does som additional validation of deprecated rules options. That function is used in various places.
I think that whole function can be removed in Wrangler V4, since the deprecated fields might be removed?
petebacondarwin
deleted the
pbd/refactor-pass-around-project-directory
branch
emily-shen
added a commit
that referenced
this pull request
Dec 4, 2024
* add telemetry commands * changeset * fix and test dates * update changeset * add global/project status * default true * remove changeset * update wrangler telemetry status feat: add `wrangler metrics` as an alias for `wrangler telemetry` (#7284) * add metrics alias * tests * use each to test alias feat: send metrics for command start/complete/error (#7267) * stop collecting userId in telemetry Co-authored-by: emily-shen <[email protected]> * implement telemetry collection * infer errorType based on the constructor name * implement common event properties * log common event properties Co-authored-by: Edmund Hung <[email protected]> * respect metric enabled/disabled * remove dispatcher.identify * include SPARROW_SOURCE_KEY in PR pre-release build * fix tests * ensure debug log covers the request failed message * replace SPARROW_SOURCE_KEY regardless whethe env exists --------- Co-authored-by: Edmund Hung <[email protected]> Co-authored-by: emily-shen <[email protected]> Co-authored-by: Edmund Hung <[email protected]> fix nested properties (#7300) feat: add banner to indicate when telemetry is on (#7302) * add banner * abort if telemetry disable * basic sendNewEvent tests * banner tests * settle promises before exiting * remove unnecessary banner logic * just check if version is different feat: add some more properties to telemetry events (#7320) * isCI and isNonInteractive * add argsUsed and argsCombination * don't include args if value is false * redact arg values if string * lint * isNonInteractive -> isInteractive cleanup defineCommand test duration log metrics request failure add draft telemetry.md add node and os versions don't send wrangler metrics from c3 if disabled don't send c3 metrics from wrangler init add config type add more comments to send-event move types out of send-event.ts add comment about applyBeforeValidation normalize into camelcase refactor telemetry command update tests and some comments normalise all args pr feedback update telemetry.md use useragent to get package manager make sendEvent/sendNewEvent sync rename sendEvent and sendNewEvent fix lock file remove flushPromises changeset fail silently feat(wrangler): make resources identifier optional if x-provision flag is enabled (#7377) Fix wrangler module import under npm monorepos (#7130) * Update import resolution for files and package exports In an npm workspace environment, wrangler will now be able to successfully resolve package exports. Previously, wrangler would only be able to resolve modules in a relative `node_modules` directory and not workspace root `node_modules` directory. * Use esbuild plugin chore(wrangler): fix type errors with experimental flags (#7391) refactor(wrangler): Explicitely pick node compat plugins for each mode (#7387) * refactor: cleanup & simplify * refactor(wrangler): Explicitely pick node compat plugins for each mode * Update packages/wrangler/src/deployment-bundle/esbuild-plugins/hybrid-nodejs-compat.ts Co-authored-by: Pete Bacon Darwin <[email protected]> * fixup! renamed vars (review feedback) * fixup! format --------- Co-authored-by: Pete Bacon Darwin <[email protected]> fix: error in angular c3 template (#7342) * fixed: related to issues-7341 AngularAppEngine class does not have .render, instead it should be .handle method * added: changeset * Tidy up changeset * fix Angular template - add a preview script so that it gets included in CI test - remove unnecessary --`experimnental-local` CLI arg - add missing `xhr2` dependency --------- Co-authored-by: Peter Bacon Darwin <[email protected]> [C3] Bump create-qwik from 1.10.0 to 1.11.0 in /packages/create-cloudflare/src/frameworks (#7359) * [C3] Bump create-qwik in /packages/create-cloudflare/src/frameworks Bumps [create-qwik](https://github.com/QwikDev/qwik/tree/HEAD/packages/create-qwik) from 1.10.0 to 1.11.0. - [Release notes](https://github.com/QwikDev/qwik/releases) - [Changelog](https://github.com/QwikDev/qwik/blob/[email protected]/packages/create-qwik/CHANGELOG.md) - [Commits](https://github.com/QwikDev/qwik/commits/[email protected]/packages/create-qwik) --- updated-dependencies: - dependency-name: create-qwik dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * chore: update dependencies of "create-cloudflare" package The following dependency versions have been updated: | Dependency | From | To | | ----------- | ------ | ------ | | create-qwik | 1.10.0 | 1.11.0 | --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Wrangler automated PR updater <[email protected]> Remove await from user Worker fetch in router-worker (#7410) fix: update Angular experimental Workers + Assets template (#7409) * fix: update Angular experimental Workers + Assets template * ci: enable tests on experimental Workers + Assets C3 templates fix: update queues max_batch_timeout in miniflare (#7399) * update timeout limit * changeset * test * remove only Co-authored-by: Carmen Popoviciu <[email protected]> --------- Co-authored-by: Carmen Popoviciu <[email protected]> refactor: move projectRoot computation to config validation (#7415) move telemetry.md out of src fixups tiody up readRawConfig Rename serve_directly to experimental_serve_directly (#7429) chore(deps): bump the workerd-and-workers-types group across 1 directory with 2 updates (#7418) Updates `workerd` from 1.20241106.1 to 1.20241202.2 Version Packages (#7358) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> ci: don't watch for changes on the workers-shared test:ci job (#7420) refactor: remove missed redundant computation of `projectRoot` (#7421) * refactor: remove missed redundant computation of `projectRoot` * test: do not watch test files in workflow fixture test jobs feat(wrangler): add inherit bindings support (#7385) * feat(wrangler): add inherit bindings support * add test * add changeset * rename file to bindings Relax type on `observability.enabled` (#7436) fix: C3 experimental template for Solid now uses correct preset (#7343) fix: allow the asset directory to be omitted in Wrangler config for commands that don't need it (#7426) fix: C3 experimental template for Nuxt now uses correct preset (#7332) * fix: C3 experimental template for Nuxt now uses correct preset * test: remove quarantine from Nuxt experimental template using the github browser merge is always a bad idea fix e2e
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A refactor to move the
projectRootfield to config (from entry) so that it can be used more flexibly.We are looking to provide a way for build tools to provide their own deployment config file (instead of the user's Wrangler config file). To find this alternative config file it will be helpful to know what the project root is before we need to compute the entry path (since that latter might depend upon the config).